Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:10:44 +0000 (09:10 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:10:44 +0000 (09:10 -0700)
commita2be1092c1563a3a20e5bf6e35e939553937604f
treef8deea8b414ff9881c95d2ab30293484d17d8dcb
parentb4a8f65eded8beedcfe7eba877ba12ad46775c31
parent870fce8617f152cce2ee01afe21237262b8c832f
Merge from trunk.